Use new -t flag on xenstore-rm to keep the store pruned when devices go away.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/examples/xen-backend.agent b/tools/examples/xen-backend.agent
index 27af3359bfc952e68fef1481d8a7cbecc19c054b..1d47e16e4f013ccad239d163a05406dcca50ad30 100755 (executable)
--- a/tools/examples/xen-backend.agent
+++ b/tools/examples/xen-backend.agent
@@ -22,7 +22,7 @@ case "$ACTION" in
         ;;
     esac
     # remove device backend store entries
-    xenstore-rm "$XENBUS_PATH"
+    xenstore-rm -t "$XENBUS_PATH"
     ;;
   online)
     case "$PHYSDEVDRIVER" in

diff --git a/tools/examples/xen-backend.rules b/tools/examples/xen-backend.rules
index 3eb5a7d56a54bfcdde8a6d683caed453a102553e..b68dbd4914a28ddd613ba442fb912faf278babf5 100644 (file)
--- a/tools/examples/xen-backend.rules
+++ b/tools/examples/xen-backend.rules
@@ -1,4 +1,4 @@
 SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ACTION=="add", RUN+="/etc/xen/scripts/block bind"
 SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ACTION=="remove", RUN+="/etc/xen/scripts/block unbind"
 SUBSYSTEM=="xen-backend", KERNEL=="vif*", ENV{PHYSDEVDRIVER}=="vif", ACTION=="online", RUN+="$env{script} up"
-SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/usr/bin/xenstore-rm $env{XENBUS_PATH}"
+SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/usr/bin/xenstore-rm -t $env{XENBUS_PATH}"